Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 28 Jul 2011 01:37:23 +0000 (18:37 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 28 Jul 2011 01:37:23 +0000 (18:37 -0700)

Trivial merge